From 3be042c4d50c08fb344702bfcfba47e5c85e8a4a Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Wed, 7 Nov 2007 02:26:06 +0000
Subject: [PATCH] Let 'configure' use the system expat on Leopard.  Hooray!

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3011 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/configure    | 10 +++++++---
 gpsbabel/configure.in |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gpsbabel/configure b/gpsbabel/configure
index 57dc97129..47f68c4ce 100755
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for GPSBabel 1.3.5.
 #
-# Report bugs to <BUG-REPORT-ADDRESS>. 
+# Report bugs to <BUG-REPORT-ADDRESS>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -4310,7 +4310,9 @@ if test "${with_expathdr+set}" = set; then
 else
 
 	case "$target" in
-	*-*-darwin*)
+	*-*-darwin6*|*-*-darwin7|*-*-darwin8)
+		# Restrict test to OS/X 10.4 and earlier.  Leopard (10.5)
+		# provides expat and in a sensible location.
 		if test -f /sw/include/expat.h ; then
 			xpathdr=/sw/include/
 		fi
@@ -4342,7 +4344,9 @@ if test "${with_libexpat+set}" = set; then
 else
 
 	case "$target" in
-	*-*-darwin*)
+	*-*-darwin6*|*-*-darwin7|*-*-darwin8)
+		# Restrict test to OS/X 10.4 and earlier.  Leopard (10.5)
+		# provides expat and in a sensible location.
 		if test -f /sw/lib/libexpat.a ; then
 			# libexpat installed via fink
 			EXPAT_LIB=/sw/lib/libexpat.a
diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in
index c96079570..e175a711b 100644
--- a/gpsbabel/configure.in
+++ b/gpsbabel/configure.in
@@ -195,7 +195,9 @@ AC_ARG_WITH(expathdr,
   [  --with-expathdr[=DIR]   Use this to specify the location of expat.h],
   [ xpathdr="$withval" ], [
 	case "$target" in
-	*-*-darwin*)
+	*-*-darwin6*|*-*-darwin7|*-*-darwin8)
+		# Restrict test to OS/X 10.4 and earlier.  Leopard (10.5) 
+		# provides expat and in a sensible location.
 		if test -f /sw/include/expat.h ; then
 			xpathdr=/sw/include/
 		fi
@@ -221,7 +223,9 @@ AC_ARG_WITH(libexpat,
     EXPAT_LIB="-L$withval -lexpat"
   ], [
 	case "$target" in
-	*-*-darwin*)
+	*-*-darwin6*|*-*-darwin7|*-*-darwin8)
+		# Restrict test to OS/X 10.4 and earlier.  Leopard (10.5) 
+		# provides expat and in a sensible location.
 		if test -f /sw/lib/libexpat.a ; then
 			# libexpat installed via fink
 			EXPAT_LIB=/sw/lib/libexpat.a
-- 
2.30.2